-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: Stuck on Setting up Wire after canceling E2EI during login [WPB-10046] 🍒 #2883
Conversation
* ci: use new cherry-pick action on release cycle 4.6 (#2726) * ci: adjust cherry-pick for rc-develop --------- Co-authored-by: Vitor Hugo Schwaab <[email protected]>
* Commit with unresolved merge conflicts * fix merge issues --------- Co-authored-by: Mohamad Jaara <[email protected]>
* Commit with unresolved merge conflicts * Fixed cherry-pick merging conflict --------- Co-authored-by: boris <[email protected]> Co-authored-by: Boris Safonov <[email protected]>
* fix: wrong failType for MLS federation errors [WPB-9087] * detekt
…2773) * fix: recreate cache directories in case cache is cleared [WPB-7368] * fix detekt
…2722) (#2738) Co-authored-by: Mohamad Jaara <[email protected]>
…ublic keys [WPB-8592] 🍒 (#2734) * Commit with unresolved merge conflicts * fix tests * detekt * Trigger CI Signed-off-by: MohamadJaara <[email protected]> --------- Signed-off-by: MohamadJaara <[email protected]> Co-authored-by: Mohamad Jaara <[email protected]>
* Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * fix tests * detekt * Trigger CI Signed-off-by: MohamadJaara <[email protected]> * Trigger CI Signed-off-by: MohamadJaara <[email protected]> --------- Signed-off-by: MohamadJaara <[email protected]> Co-authored-by: Mohamad Jaara <[email protected]>
* Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * fix tests * detekt * Trigger CI Signed-off-by: MohamadJaara <[email protected]> * Trigger CI Signed-off-by: MohamadJaara <[email protected]> * detekt * test * test * BaseProteusClientTest * fix merge issues --------- Signed-off-by: MohamadJaara <[email protected]> Co-authored-by: Mohamad Jaara <[email protected]>
…ion [WPB-8592] 🍒 (#2745) * Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * fix tests * detekt * Trigger CI Signed-off-by: MohamadJaara <[email protected]> * Trigger CI Signed-off-by: MohamadJaara <[email protected]> * detekt * test * test * BaseProteusClientTest * fix merge issues * fix merge issues * fix merge issues --------- Signed-off-by: MohamadJaara <[email protected]> Co-authored-by: Mohamad Jaara <[email protected]>
…92] 🍒 (#2746) * Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * fix tests * detekt * Trigger CI Signed-off-by: MohamadJaara <[email protected]> * Trigger CI Signed-off-by: MohamadJaara <[email protected]> * detekt * test * test * BaseProteusClientTest * fix merge issues * fix merge issues * fix merge issues * fix merge issues * fix merge issues * fix test * detekt * fix tests * fix tests --------- Signed-off-by: MohamadJaara <[email protected]> Co-authored-by: Mohamad Jaara <[email protected]>
Co-authored-by: Oussama Hassine <[email protected]>
… 🍒 (#2741) * Commit with unresolved merge conflicts * fix tests * Update logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/e2ei/E2eiCertificate.kt Co-authored-by: Vitor Hugo Schwaab <[email protected]> * fix tests --------- Co-authored-by: Mojtaba Chenani <[email protected]> Co-authored-by: Mohamad Jaara <[email protected]> Co-authored-by: Vitor Hugo Schwaab <[email protected]>
… (WPB-9038) 🍒 (#2750) * Commit with unresolved merge conflicts * resolve conflicts * resolve conflicts --------- Co-authored-by: Mojtaba Chenani <[email protected]> Co-authored-by: Yamil Medina <[email protected]>
* Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * resolve conflicts * resolve conflicts * resolve conflicts --------- Co-authored-by: Mojtaba Chenani <[email protected]> Co-authored-by: Yamil Medina <[email protected]>
…isation (WPB-8975) 🍒 (#2769) * Commit with unresolved merge conflicts * trigger CI * fix tests to match candidate changes --------- Co-authored-by: Mojtaba Chenani <[email protected]>
…er suites (WPB-9169) 🍒 (#2771) * Commit with unresolved merge conflicts * Commit with unresolved merge conflicts * trigger CI * fix tests to match candidate changes * fix tests --------- Co-authored-by: Mojtaba Chenani <[email protected]>
* chore: delete unused WireCryptobox bindings * address PR comments
* remove zip file from test resources * Trigger CI Signed-off-by: MohamadJaara <[email protected]> --------- Signed-off-by: MohamadJaara <[email protected]>
* fix: Split NoCommonProtocol error * Fixed style Co-authored-by: boris <[email protected]>
…638) 🍒 (#2838) * Commit with unresolved merge conflicts * resolve conflicts --------- Co-authored-by: Mojtaba Chenani <[email protected]>
* Commit with unresolved merge conflicts * Resolve problems after cherry-pick * Fix code-style --------- Co-authored-by: boris <[email protected]> Co-authored-by: Boris Safonov <[email protected]>
* fix: Wrong E2EI information for other users [WPB-9409] (#2828) * fix: Wrong E2EI information for other users * Added tests * Empty-Commit --------- Co-authored-by: boris <[email protected]> Co-authored-by: Boris Safonov <[email protected]>
…LS migration (WPB-9638) 🍒 (#2852) * fix(mls-migration): allow skipping users without KeyPackages during MLS migration (WPB-9638) (#2845) * fix(mls-migration): allow skipping users without KeyPackages during mls migration * change logs to debug level instead of warning * trigger CI --------- Co-authored-by: Mojtaba Chenani <[email protected]>
…2859) (cherry picked from commit 94a64c4) Co-authored-by: Mohamad Jaara <[email protected]>
* Commit with unresolved merge conflicts * asset restriction * fix tests --------- Co-authored-by: Mohamad Jaara <[email protected]>
* Commit with unresolved merge conflicts * Fixed cherry-pick issues --------- Co-authored-by: boris <[email protected]> Co-authored-by: Boris Safonov <[email protected]>
…2871) * Commit with unresolved merge conflicts * Solved cherry-pick issues * Fix tests --------- Co-authored-by: boris <[email protected]> Co-authored-by: Boris Safonov <[email protected]>
…s [WPB-7425] 🍒 (#2876) * Commit with unresolved merge conflicts * Trigger build PR * Fixed cherry-pick issues * Fixed build --------- Co-authored-by: boris <[email protected]> Co-authored-by: Boris Safonov <[email protected]>
import io.mockative.any | ||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
...
Quality Gate passedIssues Measures |
Datadog ReportBranch report: ✅ 0 Failed, 2976 Passed, 105 Skipped, 11.73s Total Time |
a153e52
to
afefda7
Compare
Will raise another PR |
This PR was automatically cherry-picked based on the following PR:
Original PR description:
What's new in this PR?
Issues
When the user wants to login with his second account, and cancels generating his certificate and then tries to login again, he’s stuck on setting up wire screen.
Causes (Optional)
When user trying to login to the same acc as already tried, client is already exist. Checking "if E2EI is required" was missed for existed clients.
Solutions
Add checking if E2EI is required for the case when user login into existed client (
VerifyExistingClientUseCase
).And update unit tests.